Various small tweaks to the router and service
Added error handling to input