Fixed route repainting, almost done?