add hrefs and perform minor cleanups