analysis: some improvements