Mostly added more comments