Update readme; some cleanup