add windows version name mappings
add arch detection on unix