Fix count on image message
Indent sub-addresses
Add a revised annotation field
Merge branch 'bpa'