More changes and plugin updates