small tweaks, some pre-location preference work taken out