Fixed the compile errors and warnings.  Clean start to the code.