many, many updates from Sverre
Merge branch 'original'