Final changes, see README for TODO items.