Added TODO
Updated badge URLs