General improvements
minor corrections