code fixes and clean up.. should compile and run now