Basic comments done