Comments and fixes.