Fix all TODO's. Fixes #21