Some changes.
Some fixes.