add moduleRouteListener, cs fixes