Merged some changes from a zombie mod