more ult calcs added (items) and more bug fixes