cleaned up some stuff, used partial for edit/new

tests are failing randomly