Redirect controller added (plus minor fixes)