Cleanup v2

build system and compiler warning cleanups v2