unifying names for export
improved note handling