Small tweakes, added check for small orders.