updated with some new patches that should resolve 7 & 9