captains: fixed sundry defects