comments and fixing