Use of xPath everywhere + documentation improved