flip the order around
Typos and other small fixes per @jsuereth