MOre updates/corrections