fix comlib
fix comlib
merge comlib