Comments and Code Update