PDF Generation Fixes

More fixes #23