Extra validation and comments on #73

Obviously depends on #73.