Ok, will path this up and update the PR, as well as other improvements.