minor fixes, order, etc.
This is all for you, Riley.