added missing keywords, constants and fix decorator
Merge pull request #116 from bbqsrc/take2

Add missing keywords, constants and fix decorator