Final fixes on the library