added locations and routes, fixed some other issues