Comments and minor syntax fix