updates to fix window issues