Fixed some PDF bugs. Renamed more private fields.