mass clean up and reduce warnings
remove all remaining warnings