Various changes/additions.