Modified location of route and msi to reflect changes, fixed null pointer errors in position and intended route