update to use new function names
more function updates
add notes