few changes, preparing windows version...