a few enhancement
last check in---i hope---of nongeneric branding