More tweaks

And such