Fixed a bunch of different things
Re-added gitkeep