revising Figure, consistent math notation, ...