Add in curved/directed arrows

Including the old implementation of (curved && directed) arrows, while leaving the correctly working new straight and (straight && curved) arrows.
Comments are included for easy identification of added code that will be removed when new curved/directed arrows are implemented.