Continued elaboration and fixes.