Several fixes.
Various improvements.