Form2 fixes, traits renamed, misc