Update readme and do a little cleanup.