Added some comments
Changed some fields and methods