Modified files and added more comments