Some tweaks & new plugins