updates for lon/lat mapping...still needs work but it looks about right