Cool, will make these changes and comment on the PR when it's ready. Thanks!