Rename selector functions, extend comments, add getByType