Further edits, fixes #1