Bugfixes. Better CContentHandler.