MOAR BUG FIXES

squashed all da bugz!