map enhancement, retrieve link data, minor bug fix