Minor bug fixes, probably going to bed soon