Incorporated fixes to warped chapter