Fixed some issues
Cleaned up more crap