pyi improvements