Minor tweaks - dealing with zeros