better error messages and minor endpoint sweetener