[Comments]: improvement & bugfixes