Edits, Fixes #1

no additional comments