Add more stuff to pdf
fix merge issues