some improvements (when working on notedo)