v.79 - Minor tweaks and changes