Tidied up notes
Merge branch 'master' into profiling