Bump version to 0.22 and update TODO a bit
Cosmetic changes in TODO