fixed submodule (again) + fixed routes