* add selector flag and logic * comments, cleanup * add readme note for selector flag * preserve comments, fix nits * readme nit