Bugfixes Round 3

+ MOAR FIXES