fix const cast, fix comment