Update README, clean up some