Fixed bug and finished routes