implement additional validations - fixes #1