Cleaned up almost all of the warnings, cleaned up imports, and fixed it up for an initial 'release'