Update TODOs
Some adjustments and add gravatar