minor changes from Stavanger