Main improvements
removed old comment