Improving comments, starting to implement +1 and removing link in legend