Added windows, updated names