Added WP-Editor, and some fixes.