minor bugfixes
+router