structure bugfixes