Cleaning up , fixing the callback , common link fixes