new changes
small fixes
Xhtml fixing
merging conflicts