improved namespace support; updated sample texts
minimal fix