Lots of minor fixes and rewrites [skip ci]
Lots of minor fixes and rewrites [skip ci]


Former-commit-id: c7fa319fb3d6b1e50482b43cdcd4b994320f4e5b
brandur/sorg,brandur/sorg,brandur/sorg,brandur/sorg,brandur/sorg