sub forms, other fixes