Fix spaces with ", "

Fixes #134
Fix clients getting kicked from too many allies/enemies.
Add missing return statements.