some improvements in the wkt (not 100% ok yet)