Fixes

Minor fixes to <form> to get it to behave correctly