Comments and namespace fixes