some notes
some fixes
some continue ...