finish editing

Mom is going to be proud of me.
Merge pull request #2 from TerziyskiG/master

finish editing fixes #1