fixed more ordering stuff