minor ordering changes