added uppercase and fixed some comments