ESI, several bugfixes and (small) additions]]>