continue work cleaning up and polishing formsets