Orders complete and some fixes