Updates to documentation and variable order.