minor changes, test on win8