count lines for a figure

also minor misc cleanups (mostlying adding missing Proof. lines
to make the counting process simpler)