map patching system cleanups and improvements