fix  and , added const class recognition, ...