Updated diagram; final version of doc