various fixes (from klutch)  still working on PC