Added a formal option to do no type I / type II correction and fix

+ Reorderd commands for reduced memory usage.