finish editing fixes #1

Simply perfect