minor tweaks from Rainer