some extra notes and fix