updates from WP v0.9.3b