feature/rowland-revisions

Revisions from Rowland.