Cleaning questions: Fixed ==, added more sort definitions, refactored sorting trace
Merged with mainline.  Removed some build files.