Modifications to Order entity
Modified the Order model, fixed bugs.