structural tweaks and more design changes