major cleanup and new readme