annotation improvements for png dumps