Doc.
Better handling of appearance.
Update TODO.