Plugin updates, minor tuning