making default handlers smarter about the resolution of the model and controller
minor fixes