bugfixes: structure