conclusion and architecture, several small changes