even more bugs
fixed 3+ people scenario