.potion mechs: better error handling (commit: 3accc19)
cleanup to map image internals (commit: 1905fff)