some tweaks to automap