Few bug fixes - everything except xPath working 100%