Some minor bug fixes such as not using .equals on string comparissons.  Now ready for testing of location tracking.