Add more properties to the directed links + minor fixes