Minor tweaks, func name updates