Clean ups and additions.