Modified minor things.

insert "@@" into the markup