small fix and enhanncement to analyzer