Some minor changes/additions.