! Lots of bugfixes related to previous commit

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