Further editing, linking stuff