general updates to architecture