more analyser improvements