Fix comment fetching
Change rest of the stuff to tidder
Merge remote-tracking branch 'origin/master'