updates based on WordPress VIP suggestions