remove invalid typenames, small bugfixes
 Please enter the commit message for your changes. Lines starting
Merge pull request #60 from dirvine/routing_v2

 remove invalid typenames, small bugfixes