Some rather light tweaks :)