More comments and fixes.