Add P/W for issue 16
Tweak paragraph tags. Was causing problems with VC++ as an xml editor.