Final tweaks I hope