Update and simplify

Eero Häihälä requested to merge 2023 into main

Commit messages tell a better story. In general, made sure it still works, fixed the parts that didn't, and removed a bunch of unnecessary complexity from operating the thing.

Merge request reports