Fixed a few function calls
Added a TODO investigation item