Bug fixes pull

Might as well. Seemed to be some things that are better off fixed