fix preselection directory naming, general cleanup