Updated / cleaned up TODO list