fixed big units bug, leading/trailing zeros bugs