Grammer
Updated class comment
Added temporary fix for Eclipse bug 389663