various improvements, wmi crash "fix"