added more tweaks from Renatas run