changes from windows & cython stuff