Fixing various issues
Fixing some more issues
Some more cleanup