fixed and added some things
Merge pull request #468 from MarcBook/master

fixed and added some things