fix comment and re-arrange our valid checks