Various Enhancements and Fixes

[ndegwamartin]

IMPORTANT: Where possible all PRs must be linked to a Github issue

Resolves #22

Engineer Checklist

• [x] I have written Unit tests for any new feature(s) and edge cases for bug fixes
• [x] I have run mvn spotless:check to check my code follows the project's style guide
• [x] I have run mvn clean test to confirm all new and existing tests passed.
• [x] I ran mvn clean package right before creating this pull request.