:bowtie: A few tweaks before leaving this here for a while