Fix links; cleanup