More cleanup. Bugfix in README