Some bugs fixed. Need to fix the window render !