Updated code comments
Rest under progress