More polish of the standards module