Adding comments to passages fixed.
Splitting story view in more templates, merging...