lots of upgrades

added form element
added message parsing of tokens in messages
emails should work - untested