Updated Routing/Fixed errors