update; todo: fix wrapping of exported objects
more