New plugins  + fixes