added missing keywords, constants and fix decorator

Let's try again, shall we?

Sorry about missing the generic.js before. I was sure it was there when I was testing, but not harm done. I noticed some other keywords were missing so I put them in as well. :)