updates based on www-style feedback