Change unite, add my plugin, fix bad comment