fix(types): improve typing#720

theacodes merged 4 commits intowntrblm:mainwntrblm/nox:mainfrom

henryiii:henryiii/fix/typeshenryiii/nox:henryiii/fix/typesCopy head branch name to clipboard