fixed a handful of bugs

also, didn't take a nap if you were wondering
blame Mark