On the leaks, the roof panels never fit like they should. About the only way to seal them up is to disassemble them and line the lower lips with weatherstripping.
The windshield has a tendency to leak at the corners as well. For the upper portion there may be some adjustment available in the hinges. You can use a small Allen wrench to loosen the set screw, then a large one to roll the cam sleeve until it’s as close to the sill as it’ll go. The lower portion typically has a factory problem. The curve of the windshield doesn’t match the curve of the dash. There is a little adjustment in the windshield latch pedestal, but you don’t want it too tight where it might break the handle.
