a few minor bug fixes
prevent E37 in map all
v1.8.3