Now ZombieBody and ZombieUnit is more complete. Fixing some issues