plugin updates, more fine tunin