some notes and fix