Squashed and ready for merging :)

added %p tag

spaced out the lines to be more readable on github

include rationale link delete extra text