some notes
some fixes