fixed #107
fixed #103
fidxed #101
Merge pull request #108 from gemoroy/typos

fixed some issues