Added selection options. (primarily for testing) Optimized the selection algorithm.
Deleted some merge-files