Updated ch2 & 3 and rebuilt documentation