Made waiting in first arena optional
improved scoring- and waitingsystem and cleaned up a bit