fix many issues with arrows