Misc cleanup, more links.