Master and routes

A lot of changes to master. Modified routes.