Added a better semantics.  Refactored some figures using fancy latex macros.