1.8 support; tidied book index a bit