form fixes, MBR/MBW constraintedto
Merge pull request #315 from patriot1burke/master

more fixes