Fix adding to order, clean some code