small selection changes,  fixed some redundancies