Fixing a bunch of mess
Fixing a bunch of stuff