Fixes, and additions.
Fixes, and additions.