Badge on order and some fixes.