Various comments and polishing