re tweaks from Kristoffer