cleaning code and links fixed