Patch a couple of deletion bugs
Implement line number counting