Cleaned up Window creation / modification. Added some logs