ZIP: Improvements to comment extraction