Fix spelling + add window before location