moved some code around in arrow and commented a bit