small fixes
WIP: new form working