Even more tweaks and bugfixes

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>