Some significant form updates