Better 531 input types, caber update