A Rite of Passage 1p and some chart fixes

Progress on #5