bug fix and adding new subchapters