Edits from Issue #11

Fixed small errors listed in #11 (some not all)