Various Fixes

This should fix quite a few things hopefully. My 973 commit was mislabed, it should have been 972, but 973 may now be fixed as well.

I honestly don't know all the issues this will address so I will leave issue numbers off. Oh, and I didn't update the readme either, sorry.