some reorg and notes