Updates and tweaks to structure