Testing properly.
Various fixes.