* Some fixes and additions.