bugfixes
routing fixes