bug fixes and notes
Did not test last code, forgot to match indentation
Merge pull request #1 from DanMcInerney/master

bug fixes and notes