WP Plugin Improvements