some final changes

i made every thing right except one thing "Window weaked " error , that
happens some times !