Comments and level0 fixes