Final tweaks, I swear