Version 2 Final

Cleaning up mostly compile warnings