Lots of updates, also for AutoPlugins

Please accept.