More tweaks
...and more...