Swift Corpus
Fix NovaAnalysis
cleanup