General changes

Added the make_link option to edit helpers