Further enhancements, check for curl/wget and OS