Added more comprehensive comments