minor tweaks and fixes to sambot