Some basic commenting added