fixing comments and warnings