General improvements

But still big problems! Window cancelation not working!! :D