Minor refactorings and probing of story 21. Henrik Karl