fix #2 - some edits