Various updates to try to get wp plugin working