Lots of language and flow improvements

A big thanks to @ocharles