cleaned up, but not done yet

fix links