fixes to form building