Bug fixes and minor improvements + chapter list improvements.