Updating PDF bookmap, plus minor changes to align better with XHTML version