added some important TODO comments

Also rewrote some of the function arguments a bit