Design and fixes.