more tweeking, more work on generating pdf report