User notes and bug fixes
Merge conflicts :P