Adjustments and some new plugins