moved things around, added notes