Instrument packages, not files
Instrument more block types
Fix display for longer files