Updated a couple things

Updated the TODO