MOD: comments
FIX: html optimization