a crap load of changes from ezekeel and franco francisco