more cleanup, internal links still borked