Fixed #6; added usage and option-proofing to a number of builtins