Linked arrow and target size, fixed some bugs