bugfixes; add support for docu layer