Repaired some bugs and added new links to config