Final tweaks

I hope