closes #6 ; improve ordering & pre-ordering