Some selection bugs fixed.