fixes for false positives as reported by Andreas:
- better end-of-class determination
- line counting

Hope this works better now.