add comments here and there