Fix errors and update chapters