add tweaks from gunthar