Extracting WP module, clean-up, bug fixes, docs