fix comment, fix some non-standard class