More work, comments and fixes.