Removed BOZO comments.
Added OrderedSet, map refactoring.
Selection now keeps order.
Merge remote-tracking branch 'origin/master'