selection improvements; ui++