README update and some cleanup.