Added base for route/remarks code...

And bug fixes…