Changes to compile w/o warnings and errors in g++. Adding in performance optimizations for VS
Perf additions to VS project