renamed stuff more sensibly
can add comments, but can't display them