Commit No. 6 - Bug fixes in pl and xml; Final version