Some basic selection features
some changes