add missing breaks
fix comment, add return
fix string.
Merge pull request #1 from yadimon/master

thank you!