more tweaks :-)