Fixed Zombie issues
Other stuff