made some changes to windowing issues