Got rid of a few TODO's. There are still quite a lot remaining.