Updated comments, fixed visibility