More fixes

Git tree fucked up somehow, while commits are still in log for repo as whole, if you go down to files, they are not listed.
Had to manually reapply many fixes by getting not screwed zipball.