Got ingredient ordering to work; minor changes elsewhere