more minor structural things