fixed some more general stuff

[niccholasw]

Describe the issue

A clear and concise description of what the issue is

Describe the solution

A clear and concise description of what the solution is

Risks

Potential risks that this PR might bring

Definition of Done

• Code peer-reviewed
• Wiki Documentation is written and up to date
• Unit tests written and passing
• Integration tests written and passing
• Continuous integration build passing
• Acceptance criteria met
• Deployed to production environment

Reviewed by

Who reviewed your PR - for commit history once merged