form module and other fixes