Couple of changes to make things nicer, as well as progress on
suggestions.