changed story layout
adds some notes
resolves conflicts