Working with order.js, fixing minor issues