- Tightened up the locking in the WP app
- Refactored the WP app a bit