better intro, simplify some slides, reorg