plugin final improvements