Most ordering stuff fixed