Misc updates, and a change in design.