more sensible value checking, remove name checking