Fixed bugs in order process. Small Changes