Updated routes and some todos