many, many updates from Sverre