Ordered use

Few fixes