some notes
some fixes
some fixes