added better search and rbenv support