fixed some small bugs on presentation and also in the order model