some cleaning, began working on selection