Redesign: misc fixes.