form fix and tweak