More common user agent string and minor cleanups