Cleaned up some comments, small tweaks, but also started messing with the build process.  Currently still works