comments and fixed a class issue