slight improvements in analysis