simplify tracker and fix some selection problems