a bunch of tweaks to structure