Cleaned up broken links and added more faking