Fixed bugs in loader, working on support for periods in route name