more form work and cleaning up from last big push

cleaning up + adding