A nearly entire rework of the library.