cleaned location stuff, changed default GPS to false
fixed merge