fixed location services
attempts to fix location stuff
merge conflicts