Comment and some fixes