Fix merging bugs; add GPS option.