Added position processing for arrow and disc axes, did some other changes.