Message fixes and default values changed
Merge pull request #207 from Ribosoft/gab

Message fixes and default values changed