Selection made better

changed file locations, selection stuff, and other things