Syntax changes and model update changes

[michplunkett]

Description of Changes

A lot of small syntax changes along with adding missing field inclusions.

Tests and linting

• [x] This branch is up-to-date with the develop branch.
• [x] pytest passes on my local development environment.
• [x] pre-commit passes on my local development environment.

[michplunkett]

@sea-kelp, at the very least it should be an f-string. We can change that on the next code change.