comments and polishing