Major code tidy, added ability to change to zombie villagers