Add support for notetakers. Improve interface.