Push window to stack only once!

And remove comments