Loads of great suggestions. Do you fancy making a PR? If not could you turn this into a GH issue for me to track?