Some interface tweaks and bug fixes.