added note list
some code cleanups