some more basic structure changes