commenting methods and fixes