further progress with the funcitons chapter translation to xml
resolved conflict