not finished
minor update
merge commit
update to unified lon/lat format