fixed up ordering in a few places