Fixed nasty bugs, screw clang