Interface tweaks and a more interesting patch.