Fix analysis bugs
Remove duplicate analysis
Fix CLASS
Improve analysis of guessed organisation names