Fixed some CS
Fixed routing