Some final tweaks I guess