many updates and form changes