move some methods to a new mixin. some more minor changes for windows.