cut and paste from email
Some fixes.