commentary
more improvements