fix software name
fix cross-platform code changes that depend on Mac version
fix unused setup page
Merge branch 'mac_work' into mac