Add presentational logic notes, small tweaks