more cleanup and build process fixed slightly