add pages to 1258, add firespike 1040, reformat chapters