Removing warnings and stuff
Merge and fixes