Add notes to clarify what abilities go where
More minor tweaks to use the new format