Clean up some WIP code
Better messaging on the README