Made several changes to the library.