Comments and some markup fix