modified utility classes, and fixed all the resulting broken things