[fix] initial patch up of analyzer, wip