Some unclear bugs and make-up, comments