Minor tweaks - unfinished.