Fixed a few more notes from Niall