enable librarysort, minor edits