v0.0.2x - (part 2) - adding comments