Various changes that I hadn't thought of prior to trying this out