Cleanup selection system. Fix #100 (don't ask me how I fixed it, but I can't reproduce it anymore)