About window and updated a minor thing