Lots of Updates/Fixes

A lotta stuff, what can I say.