Cleanups, update TODO's.