Put in a few todos

Updated a few things, found some new bugs that need to be worked out.