Some architectural changes mixed in with further documentation