bugfixes + route