Some tending to warnings
Lots of cleanup and updates