many changes. architecture chapter is almost ready