Readme changes, cleanup