little improvements on vigilante