master - adjustments to pathmanager and errorcontroller