Minor tweak and to-do comments
Added trailing zeros fix