Cleanup and Readme corrections.