Signed-off-by: mkljczk <git@mkljczk.pl>
Also includes various minor fixes.
Co-authored-by: Michael Murphy <michael@mmurphy.dev>