Fix notation.
Various on going work.. (WIP).