Added Frigates and Snipers and fixed concurrency problems