Updated a few TODO statements