removed a few TODOs and deletet a possible error source. Now we take the workers only if they are ready or collect minerals. The vespene guys stay where they are