Update readme with latest changes and some cleanup.