Fixed to many zombies and moved some fields up