More fixes

Just figuring out how to use git :P