update support class and some comments