tidy up validations on question
update todo with more stuff