Add 2 plugins and some corrections.