Updated comments/docs