Fix #68, Fix #64 (again)
also build complete PDF