Update for Issue 37.

Also switched order of validation message and helptext