Added ordering

Also removed some currently unnecessay logging.