some more tweaks :D