cleanup and trying to add links