Missing keywords, constants and decorator fix

Noticed some missing handlers, so I patched them in. :)