Added apeatoll, fixed khazard formulas, added border guards