moved TODO to Github, removed some comments, reflowed some lines