Starting over, cleaning up and modifying code to build in Linux
some cleaning