Update README and do some cleanup