Tweaks to notation and some extra content