Bug fixes and enhancements for document "notes-05-01-14"