cleaned up handlers, added interceptors, cleaned up model/persistence warnings