Comments and some fixes