Clean some stuff up, add "Windows or Linux" mode