Some more small changes but need to sort out order/orderline stuff