minor code cleanup and zorder/bb adjustment for satchel and mole_hole