Update form messaging to be more flexible. Fixes #80