Hopefully last tweaks :-) for 1.1