Fixed some links, cleaned up