fixed double call issue on controller from router, misc cleanup