fixing up some selection stuff