formula changes to WP riders and bug fixes