Comments and fixed includes