Renaming, and added draw-method for linkage-location.
Bug fixes and implemented constant removal.