further work on link creation and index