add empty word check and comment