Finished updating function and template descriptions

Also minor code changes as required.