Using items in battle targets correctly

Other small changes.