few TODOs and development in AnalyzApp