Big cleanup of code
Added some more stuff we need
Cleanup