Misc cosmetic cleanup and added promo message