Update readme, cleanup fixes #1