cleaned up code and links.