update some, and add __inv signature