general changes to order functionality