All around fixes to map info display including same fault tolerance.