clarified some class names
small changes