Restoring some stuff that accidentally got deleted when I put in the arrow buying fixes