Clearer examples and revamp some of the method names.