language fixes
prepare for comment changes
doh, just CLASS not CLASSNAME