Some structural changes, about done and extra links