completed chapter on architecture + some fixes