More OAI cleanup and external URL additions