minor modifications to an example, and some extra validation in core