Some screwing around and cleanup

Yup, didn’t accomplish much because this current location bullshit is
sapping all my time