merging Eric's PDF related changes