Ordering

Code Fixes!