Fixed routes being too greedy, added route params; dev 0.1.4