clean things up, selector overhaul