Fix #22, and an ordering update.