Added better kill window command