fixed window problem and updated TODO