A few cleanup changes and new items in the issue list:
This resolves the issues:
Here is what it looked like before:
And here is the result of the commits in this PR
Title needs adjustment here, I'll fix it
Nice one, and unit-tests are passing :)