Fixed bug in routing, updated calc
Fixed bug in routing, updated calc