renamed some classes, adding comments.