fixed comment and cs
moved the new parameter at the end of the list
fixed xhtml