lots of minor changes while testing lots of structures