sprucing up sambot

also some minor cleanup on steffbot