Alter boat count
Fix bug in regroup