Work to make plugins more universally benefitial. Also fixing some errors.