Windows bug fixed;
Clear some code;