add samples; tweak cosmetics