Validate 'units'. Improved documentation. Some housekeeping