comments' fixed
final markup, fixed comments