Added GPS and minor changes