beef up validations, beef up specs
1.6.6