Bunch of fixes

wut?