fix comments and class names and such