Bugs resolved and implement rename and link.