Function comment mods.
Remove ID from table, update hook. Minor changes. Drops wrapper.