implemented target selector, other changes