adding some things, some windows fixes