some edits and fixes

some edits and fixes
Merge pull request #9 from delihiros/niitsuwork

Niitsuwork