Guideline link and fixing bugs