More another edits, fixes #1