Updated map viewer, still using older parser but getting closer to convergence