fixes and additions.