More small fixes.
More and more changes.