Added more of demolish. Fixed bug in window_close