Added Acid Zombie type and (hopefully) dealt with some more concurrency issues.