comments greatly improved