Done (missed it during the initial code review). Just waiting on answers to the other questions below.