'validator' added and minor changes