typo corrected. Most of previous changes work