fix gridding system; add map; minor changes