Improve chapters based on Ernie's feedback