Minor changes to order of new variables in code and documentation.