analyser improvements