Map view, etc. updated more - mostly polished.