Updated comments
Added debug