Changed routing (closes #213)
Minor fixes