Fix nick assignment beyond 1 player + Cleanup