arrow for movement in the middle of dev and some other small changes)