polish additions
bug fixes
Merge pull request #52 from Studyokee/polish

Polish