More features, mroe error detection