Some adjustments per comments from Heikki