start merging andreas' comments on initial conditions section