Review library

See commit messages.