Lots of little fixes hopefully
Figured, but not yet fixed inventory order things