Added "Vigilance" buff and cleanup.