a few more and a few fixes
Merge pull request #1 from j4m355/master

few more for you