more docking improvements