commented, minor changes