Lots of changes, mostly tidying form validation, and making changes from encrypted->nonencrypted PM's smoother