Add stateful comments
Fix up line numbers