Lots of changes to list chapter