moved more wave spawn logic around... housekeeping at this point