fixed bug where some input would sometimes be lost on windows
solved merge conflicts